Auto merge of #2015 - alexcrichton:fix-nightly, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 1 Oct 2015 16:44:57 +0000 (16:44 +0000)
committerbors <bors@rust-lang.org>
Thu, 1 Oct 2015 16:44:57 +0000 (16:44 +0000)
Some output of failing tests have been tweaked, so update the associated tests.


Trivial merge